From: Jan Djärv <jan.h.d@swipnet.se>
Date: Fri, 2 Apr 2010 09:45:27 +0000 (+0200)
Subject: Merge from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~5204
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7a5a264fc27bde6870f08ecc5d85eddc36fa0336;p=emacs.git

Merge from trunk
---

7a5a264fc27bde6870f08ecc5d85eddc36fa0336